Bug 591077 - Hide overlay when activating an application

It's easier to explicitly call Main.overlay.hide() instead
of chaining activation signals, this got lost in a mix between
the big dash rewrite and ongoing changes to the Application well.

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index a3cf04503828f700eb9bff8b01af485d3ff76efe..6e335216bdfdd527feb7cbde7524810de15aea21 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -687,7 +687,7 @@ AppWell.prototype = {
 
         this._favoritesArea = new WellArea(width, true);
         this._favoritesArea.connect('activated', Lang.bind(this, function (a, display) {
-            this.emit('activated');
+            Main.overlay.hide();
         }));
         this.actor.append(this._favoritesArea.actor, Big.BoxPackFlags.NONE);
 
@@ -697,7 +697,7 @@ AppWell.prototype = {
                                          padding_top: GenericDisplay.PREVIEW_BOX_PADDING });
         this._runningArea = new WellArea(width, false);
         this._runningArea.connect('activated', Lang.bind(this, function (a, display) {
-            this.emit('activated');
+            Main.overlay.hide();
         }));
         this._runningBox.append(this._runningArea.actor, Big.BoxPackFlags.EXPAND);
         this.actor.append(this._runningBox, Big.BoxPackFlags.NONE);

diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js
index 0d7a2ab070b36b8809dc1cdb3ca98d9fb2b12c1d..22e26e259184f1655318488bb600d520e72565da 100644 (file)
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@@ -380,7 +380,7 @@ GenericDisplay.prototype = {
         this._redisplay(true);
     },
 
-    // Launches the item that is currently selected and emits 'activated' signal.
+    // Launches the item that is currently selected, closing the overlay
     activateSelected: function() {
         if (this._selectedIndex != -1) {
             let selected = this._findDisplayedByIndex(this._selectedIndex);